Reviewing files that changed from the base of the PR and between a7ab59c and 421fbe1.

• SWLOR.Game.Server/Feature/AbilityDefinition/Force/ForceLeapAbilityDefinition.cs (10 hunks)
• SWLOR.Game.Server/Feature/AbilityDefinition/OneHanded/PommelStrikeAbilityDefinition.cs (1 hunks)
• SWLOR.Game.Server/Feature/AbilityDefinition/TwoHanded/HardSlashAbilityDefinition.cs (1 hunks)
• SWLOR.Game.Server/Feature/PerkDefinition/ForcePerkDefinition.cs (2 hunks)
• SWLOR.Game.Server/Feature/PerkDefinition/OneHandedPerkDefinition.cs (2 hunks)
• SWLOR.Game.Server/Service/AbilityService/RecastGroup.cs (1 hunks)
• SWLOR.Game.Server/Service/PerkService/PerkType.cs (1 hunks)
• SWLOR.Game.Server/Service/Stat.cs (1 hunks)
• SWLOR.NWN.API/NWScript/Enum/FeatType.cs (1 hunks)

SWLOR.Game.Server/Service/PerkService/PerkType.cs (1)

303-308: New PerkType.PommelStrike enum value needs matching 2DA entry

Adding PommelStrike = 300 is consistent, but since these IDs are tied to iprp_resperk.2da, double‑check that a corresponding row with ID 300 has been added there (and any other relevant 2DAs) so the perk can be selected and used correctly at runtime.

SWLOR.Game.Server/Feature/AbilityDefinition/TwoHanded/HardSlashAbilityDefinition.cs (1)

44-52: Hard Slash II/III damage tuning is mechanically safe

Only the base damage for levels 2 and 3 changed (to 29 and 43). The rest of the hit / damage pipeline is unchanged, so this is a straightforward balance tweak with no functional regressions.

SWLOR.NWN.API/NWScript/Enum/FeatType.cs (1)

1966-1968: Pommel Strike feat IDs look consistent – verify 2DA/TLK wiring

PommelStrike1/2/3 appended at 1997–1999 fits the existing custom‑feat range and matches the usages in the Pommel Strike ability and perk definitions. Just ensure the corresponding rows exist in feats.2da (and TLK strings) at these indices so the feats show up and function correctly.

SWLOR.Game.Server/Service/AbilityService/RecastGroup.cs (1)

260-261: Pommel Strike recast group definition is consistent

The new RecastGroup.PommelStrike entry (display name + short name) matches the pattern used by other one‑handed activatables and keeps the short label within the GUI’s length constraint. This should integrate cleanly with the Pommel Strike ability definitions.

SWLOR.Game.Server/Feature/PerkDefinition/ForcePerkDefinition.cs (1)

36-40: Force Leap perk relocation into Force tree looks coherent – sync with ability implementation

Moving Force Leap into ForcePerkDefinition as PerkCategoryType.ForceUniversal / PerkType.ForceLeap with three levels (ForceLeap1–3) and Force skill requirements 15/30/45 matches the intent of making it a generic Force power. The builder usage follows the existing perk pattern and coding guidelines for perk definitions.

Please just double‑check that ForceLeapAbilityDefinition uses the same damage values (8/15/23) and the same 2‑second stun described here so players see accurate tooltip text.

Also applies to: 116-141

SWLOR.Game.Server/Feature/PerkDefinition/OneHandedPerkDefinition.cs (1)

48-48: Pommel Strike perk wiring is consistent with existing one‑handed lightsaber perks

PommelStrike() is correctly added to BuildPerks and defined as a three‑tier lightsaber perk under PerkCategoryType.OneHandedLightsaber with reasonable OneHanded skill gates, Force‑sensitive requirement, and Droid AI slots. The feat grants (PommelStrike1–3) match the new FeatType entries, and the builder usage aligns with the existing patterns for Shield Bash / Saber Strike and the project’s builder‑pattern guidelines. Based on learnings, this fits the expected perk‑definition style.

Also applies to: 873-901

SWLOR.Game.Server/Feature/AbilityDefinition/Force/ForceLeapAbilityDefinition.cs (2)

1-41: Weapon validation now correctly allows any melee weapon

The updated validation:

if (!Item.OneHandedMeleeItemTypes.Contains(rightHandType) &&
    !Item.TwoHandedMeleeItemTypes.Contains(rightHandType))
{
    return "A melee weapon must be equipped in your right hand to use this ability.";
}

matches the PR objective of making Force Leap available with any melee weapon (while still disallowing unarmed/ranged). The error message is aligned with the logic, and the rest of the range check/empty-string success path remains unchanged.

---

119-166: FP requirements per rank correctly convert Force Leap into a Force resource ability

The three Force Leap ranks now use FP instead of stamina:

• Rank I: .RequirementFP(3)
• Rank II: .RequirementFP(4)
• Rank III: .RequirementFP(5)

Recast, activation, range, and flags are unchanged, and all three still use PerkType.ForceLeap and the shared validation/impact delegates. This cleanly aligns the resource type with the Force skill and Force namespace.

Reviewing files that changed from the base of the PR and between 421fbe1 and 87ebec1.

• SWLOR.Game.Server/Feature/AbilityDefinition/OneHanded/PommelStrikeAbilityDefinition.cs (1 hunks)
• SWLOR_Haks (1 hunks)

• SWLOR_Haks

SWLOR.Game.Server/Feature/AbilityDefinition/OneHanded/PommelStrikeAbilityDefinition.cs (1)

37-87: I'll help you verify the review comment about the perk-adjusted stat usage in the Pommel Strike ability. Let me start by investigating how GetPerkAdjustedAbilityScore is defined and used throughout the codebase.
<function_calls>
<invoke_name>shell

#!/bin/bash

Find the definition of GetPerkAdjustedAbilityScore

rg -n "GetPerkAdjustedAbilityScore" SWLOR.Game.Server -B2 -A5 --type cs | head -100

</invoke_name>
</function_calls>

Looking for the method definition and usage patterns to understand the API contract.
<function_calls>
<invoke_name>shell

#!/bin/bash

Search for the method definition more specifically

rg -n "GetPerkAdjustedAbilityScore\s*(" SWLOR.Game.Server --type cs | head -20

</invoke_name>
</function_calls>

Let me also look at the Combat class to find the method definition:
<function_calls>
<invoke_name>shell

#!/bin/bash

Find Combat class and GetPerkAdjustedAbilityScore method

find SWLOR.Game.Server -type f -name "Combat.cs" | head -5

</invoke_name>
</function_calls>

<function_calls>
<invoke_name>shell

#!/bin/bash

Search for Combat class files

fd -t f "Combat.cs" SWLOR.Game.Server

</invoke_name>
</function_calls>

<function_calls>
<invoke_name>shell

#!/bin/bash

Search for any file containing GetPerkAdjustedAbilityScore definition (not just usage)

rg -n "public.*GetPerkAdjustedAbilityScore" SWLOR.Game.Server --type cs -B2 -A8

</invoke_name>
</function_calls>

<function_calls>
<invoke_name>shell

#!/bin/bash

Let's look at all usages with more context to understand the pattern

rg -n "GetPerkAdjustedAbilityScore" SWLOR.Game.Server --type cs -B3 -A3 | head -150

</invoke_name>
</function_calls>